checkpatch: ignore GIT_COMMIT_ID

By default, the checkpatch script requires that commit references
included in commit messages follow a predefined format. Github
merge commits do not follow this convention, causing the code
style test to fail when a new pull request is created.

This patch adds the ignore GIT_COMMIT_ID option to the checkpatch
parameters. This flag indicates the tool to ignore the commit
message format.

Change-Id: I37133cc5cf803f664b8ff00f62d458b39f06918c

diff --git a/Makefile b/Makefile
index 1e2f324c05f2dcb05a6ac8cae00b0edae232b995..4f7d3de95e5dbf09f379090288ac024d0de10d69 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -77,7 +77,9 @@ TRUSTED_BOARD_BOOT    := 0
 AUTH_MOD               := none
 
 # Checkpatch ignores
-CHECK_IGNORE           =       --ignore COMPLEX_MACRO --ignore GERRIT_CHANGE_ID
+CHECK_IGNORE           =       --ignore COMPLEX_MACRO \
+                               --ignore GERRIT_CHANGE_ID \
+                               --ignore GIT_COMMIT_ID
 
 CHECKPATCH_ARGS                =       --no-tree --no-signoff ${CHECK_IGNORE}
 CHECKCODE_ARGS         =       --no-patch --no-tree --no-signoff ${CHECK_IGNORE}